wayland: Remove all mentions of visuals
authorBenjamin Otte <otte@redhat.com>
Thu, 3 Nov 2016 23:17:57 +0000 (00:17 +0100)
committerBenjamin Otte <otte@redhat.com>
Thu, 3 Nov 2016 23:17:57 +0000 (00:17 +0100)
gdk/wayland/gdkglcontext-wayland.h
gdk/wayland/gdkscreen-wayland.c

index bd2bb88457151ae7aa4ed5f7b19b313d04b8d2fc..4908ba7968182cbbb8c89fb243a4dd4f8f1637f4 100644 (file)
@@ -24,7 +24,6 @@
 
 #include "gdkglcontextprivate.h"
 #include "gdkdisplayprivate.h"
-#include "gdkvisual.h"
 #include "gdkwindow.h"
 #include "gdkinternals.h"
 #include "gdkmain.h"
index 5004438fc5a7637e6d0ee8369d3266f899895889..a9af78f9f7618641758df8f59400686234e5ef88 100644 (file)
@@ -23,7 +23,6 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include "gdkscreenprivate.h"
-#include "gdkvisualprivate.h"
 #include "gdkdisplay.h"
 #include "gdkdisplay-wayland.h"
 #include "gdkmonitor-wayland.h"
@@ -58,9 +57,6 @@ struct _GdkWaylandScreen
   GdkDisplay *display;
   GdkWindow *root_window;
 
-  /* Visual Part */
-  GdkVisual *visual;
-
   GHashTable *settings;
   GsdXftSettings xft_settings;
 
@@ -98,8 +94,6 @@ gdk_wayland_screen_finalize (GObject *object)
   if (screen_wayland->root_window)
     g_object_unref (screen_wayland->root_window);
 
-  g_object_unref (screen_wayland->visual);
-
   g_hash_table_destroy (screen_wayland->settings);
 
   G_OBJECT_CLASS (_gdk_wayland_screen_parent_class)->finalize (object);
@@ -607,55 +601,6 @@ gdk_wayland_screen_get_setting (GdkScreen   *screen,
   return FALSE;
 }
 
-typedef struct _GdkWaylandVisual       GdkWaylandVisual;
-typedef struct _GdkWaylandVisualClass  GdkWaylandVisualClass;
-
-struct _GdkWaylandVisual
-{
-  GdkVisual visual;
-};
-
-struct _GdkWaylandVisualClass
-{
-  GdkVisualClass parent_class;
-};
-
-GType _gdk_wayland_visual_get_type (void);
-
-G_DEFINE_TYPE (GdkWaylandVisual, _gdk_wayland_visual, GDK_TYPE_VISUAL)
-
-static void
-_gdk_wayland_visual_class_init (GdkWaylandVisualClass *klass)
-{
-}
-
-static void
-_gdk_wayland_visual_init (GdkWaylandVisual *visual)
-{
-}
-
-#define GDK_TYPE_WAYLAND_VISUAL              (_gdk_wayland_visual_get_type ())
-#define GDK_WAYLAND_VISUAL(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WAYLAND_VISUAL, GdkWaylandVisual))
-
-/* Currently, the Wayland backend only ever uses ARGB8888.
- */
-static GdkVisual *
-gdk_wayland_visual_new (GdkScreen *screen)
-{
-  GdkVisual *visual;
-
-  visual = g_object_new (GDK_TYPE_WAYLAND_VISUAL, NULL);
-  visual->screen = GDK_SCREEN (screen);
-  visual->type = GDK_VISUAL_TRUE_COLOR;
-  visual->depth = 32;
-  visual->red_mask = 0xff0000;
-  visual->green_mask = 0x00ff00;
-  visual->blue_mask = 0x0000ff;
-  visual->bits_per_rgb = 8;
-
-  return visual;
-}
-
 GdkScreen *
 _gdk_wayland_screen_new (GdkDisplay *display)
 {
@@ -667,8 +612,6 @@ _gdk_wayland_screen_new (GdkDisplay *display)
   screen_wayland = GDK_WAYLAND_SCREEN (screen);
   screen_wayland->display = display;
 
-  screen_wayland->visual = gdk_wayland_visual_new (screen);
-
   screen_wayland->root_window =
     _gdk_wayland_screen_create_root_window (screen, 0, 0);